Sync with upstream @ 97ef8624 - #170
Closed
javascript-translate-bot wants to merge 793 commits into
Closed
Conversation
Clarify some things in 1.5.12
FIX: some typo error
Minor grammar alteration.
Rephrased for better clarity.
Fix typo in 2.2.5 (Dispatching custom events)
Fix typo in 2.3.1 (Mouse events)
Buffer purpose. And missing "s".
example is fixed and summary is extended due to feedbacks
first fulfilled promise can not return error.
FIX: typo error in dom-nodes and corresponding CSS need to be fixed
Fixed couple of grammar mistakes.
Fix typo in 2.99.2 (Selection and Range)
Correct subhead in 3.1 (Popups and window methods)
Fix possible typos in 4.1 (ArrayBuffer, binary arrays)
"exception" vs "new feature" ?
Missing word / small fix.
Spelling error: 'out'-->'our' Idiom: 'From the other hand'-->"On the other hand"
Spelling error & wrong idiom
Update article.md
too wordy explanation
Fix mismatched alert text
In the original it's read as if there is two rabbit methods, instead of "both to... and also to..."
to both -> both to
modify alternative method in comment of mixins' code example
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at 97ef862
Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.
Alternatively, you can close this PR and merge conflicting changes manually.
The following files have conflicts and may need updates of the translations:
Click to open a list of 108 files
To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterPlease ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).
This PR will be closed and replaced with a new one in a few days.